From 53ced80154fa51feb8d7569d84102638f1379013 Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@gmail.com>
Date: Tue, 28 Nov 2017 09:34:16 -0700
Subject: [PATCH] address reviewer concerns wrt inno setup.

---
 appveyor.yml     | 18 +++++++++++++-----
 gui/setup.iss    | 17 ++++-------------
 gui/setup.iss.in | 17 ++++-------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a3f5bcc1d..9e059546e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,18 +40,25 @@ build_script:
         Get-Location
         qmake -query
         # mimic creator shadow build to match Inno setup file
-        New-Item ..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release -type directory -force
-        cd ..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release
+        $gpsbabel_build_dir = "build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release"
+        $gui_build_dir = "build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release"
+        # make sure we are staring with a clean build directory
+        Remove-Item "..\$($gpsbabel_build_dir)" -Recurse -ErrorAction Ignore
+        New-Item "..\$($gpsbabel_build_dir)" -type directory -force
+        cd "..\$($gpsbabel_build_dir)"
         qmake ..\gpsbabel\GPSBabel.pro -spec win32-g++
         mingw32-make qmake_all
         mingw32-make
         if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
         # copy GPSBabel.exe for use by test_script
+        Remove-Item ..\gpsbabel\release -Recurse -ErrorAction Ignore
         New-Item ..\gpsbabel\release -type directory -force
         Copy-Item release\GPSBabel.exe ..\gpsbabel\release\GPSBabel.exe
         cd ..\gpsbabel
-        New-Item build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release -type directory -force
-        cd build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release
+        # make sure we are staring with a clean build directory
+        Remove-Item "$($gui_build_dir)" -Recurse -ErrorAction Ignore
+        New-Item "$($gui_build_dir)" -type directory -force
+        cd "$($gui_build_dir)"
         qmake ..\gui\app.pro -spec win32-g++
         mingw32-make qmake_all
         mingw32-make
@@ -68,7 +75,8 @@ build_script:
         & 'C:\Program Files (x86)\Inno Setup 5\ISCC.exe' ..\gui\setup.iss
         cd ..
         $sha=(git rev-parse --short HEAD)
-        Get-ChildItem .\gui\release\*.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha).exe" }
+        Get-ChildItem .\gui\release\GPSBabel-*-Setup.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Setup.exe" }
+        Get-ChildItem .\gui\release\GPSBabel-*-Manifest.txt | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Manifest.txt" }
       }
       elseif ($env:platform -eq "mingw")
       {
diff --git a/gui/setup.iss b/gui/setup.iss
index c5734a05b..30dd4bf23 100644
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -4,11 +4,9 @@
 ; synchronized.
 ;
 ; Script for generating installation setup program for GPSBabel
-; Uses the Inno setup compiler.  Typically used from the command
-; line "makesetup.bat" which copies QT system files which
-; the Innosetup compiler cannot handle.
-;
-; So it is not a good idea to run this file from the Inno Setup GUI.
+; Uses the Inno setup compiler.
+; windeployqt should be run to prepare the necessary Qt files before
+; running Inno Setup.
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -25,6 +23,7 @@ DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
 OutputBaseFilename=GPSBabel-1.5.4-Setup
+OutputManifestFile=GPSBabel-1.5.4-Manifest.txt
 SetupIconFile=images\babel2.ico
 Compression=lzma
 SolidCompression=yes
@@ -37,11 +36,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-; This isn't as wreckless as it seems; these directories are populated on a
-; controlled way by the batch file.
-;Source: qtdir\bin\*.dll;		DestDir: "{app}"; Flags: ignoreversion
-;Source: qtdir\plugins\*; 		DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs
-
 Source: gmapbase.html; 			DestDir: "{app}"; Flags: ignoreversion
 Source: qt.conf;       			DestDir: "{app}"; Flags: ignoreversion
 
@@ -58,9 +52,6 @@ Source: ..\..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release\release\gpsbab
 ; Source: gpsbabel_*.qm;           	DestDir: "{app}\translations"; Flags: ignoreversion
 Source: gpsbabelfe*.qm;           	DestDir: "{app}\translations"; Flags: ignoreversion
 
-; Now translations from Qt's own UI stuff.
-;Source: qtdir\translations\*;  		DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
-
 ; Miscellaneous
 Source: COPYING.txt;			DestDir: {app}; Flags: ignoreversion
 ; Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 2c14bb8f1..9c9e463db 100755
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -4,11 +4,9 @@
 ; synchronized.
 ;
 ; Script for generating installation setup program for GPSBabel
-; Uses the Inno setup compiler.  Typically used from the command
-; line "makesetup.bat" which copies QT system files which
-; the Innosetup compiler cannot handle.
-;
-; So it is not a good idea to run this file from the Inno Setup GUI.
+; Uses the Inno setup compiler.
+; windeployqt should be run to prepare the necessary Qt files before
+; running Inno Setup.
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -25,6 +23,7 @@ DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
 OutputBaseFilename=GPSBabel-@PACKAGE_VERSION@@PACKAGE_RELEASE@-Setup
+OutputManifestFile=GPSBabel-@PACKAGE_VERSION@@PACKAGE_RELEASE@-Manifest.txt
 SetupIconFile=images\babel2.ico
 Compression=lzma
 SolidCompression=yes
@@ -37,11 +36,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-; This isn't as wreckless as it seems; these directories are populated on a
-; controlled way by the batch file.
-;Source: qtdir\bin\*.dll;		DestDir: "{app}"; Flags: ignoreversion
-;Source: qtdir\plugins\*; 		DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs
-
 Source: gmapbase.html; 			DestDir: "{app}"; Flags: ignoreversion
 Source: qt.conf;       			DestDir: "{app}"; Flags: ignoreversion
 
@@ -58,9 +52,6 @@ Source: ..\..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release\release\gpsbab
 ; Source: gpsbabel_*.qm;           	DestDir: "{app}\translations"; Flags: ignoreversion
 Source: gpsbabelfe*.qm;           	DestDir: "{app}\translations"; Flags: ignoreversion
 
-; Now translations from Qt's own UI stuff.
-;Source: qtdir\translations\*;  		DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
-
 ; Miscellaneous
 Source: COPYING.txt;			DestDir: {app}; Flags: ignoreversion
 ; Source: AUTHORS;			DestDir: {app}; Flags: ignoreversion
-- 
2.30.2